Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 22 May 2010 03:32:53 +0000 (03:32 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 22 May 2010 03:32:53 +0000 (03:32 +0000)

Trivial merge